From d31bb8b50359ccaeb4f7f0efa84edf034bd5448d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 28 Jun 2020 11:13:59 -0400 Subject: [PATCH] testsuite: Don't pass GDK_DEBUG for release builds The debug env vars are ignored in release builds, and may spew warnings about that fact that break tests. --- testsuite/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testsuite/meson.build b/testsuite/meson.build index b7b0061ae3..47ce9a6134 100644 --- a/testsuite/meson.build +++ b/testsuite/meson.build @@ -9,12 +9,15 @@ diff = find_program('diff', required: true) common_env = [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', - 'GDK_DEBUG=default-settings', 'GTK_CSD=1', 'G_ENABLE_DIAGNOSTIC=0', 'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir), ] +if get_option('debug') + common_env += [ 'GDK_DEBUG=default-settings' ] +endif + add_test_setup ('x11', is_default: true, env: common_env + [ -- 2.30.2